merge?

diff --cc tools/python/xen/xend/XendDomainInfo.py
index 7251239bad4ad448f0efb393e635b618884ff3f3,dd6be87a98960d8cdff1dabca8dfcbc40b6543a0..d75d872b5c416ac1fda378eb4fe44899f5c8b5b6
--- 1/tools/python/xen/xend/XendDomainInfo.py
--- 2/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@@ -808,10 -814,10 +808,9 @@@ class XendDomainInfo
      def create_channel(self):
          """Create the channels to the domain.
          """
 -        self.store_channel = self.eventChannelOld("store_channel")
 -        self.console_channel = self.eventChannel("console", "port")
 -
 +        self.store_channel = self.eventChannel("store/port")
 +        self.console_channel = self.eventChannel("console/port")
  
- 
      def create_configured_devices(self):
          devices = sxp.children(self.config, 'device')
          for d in devices: